Merge "Make pairwise() only subscribe to upstream once" into tm-qpr-dev am:...

Merge "Make pairwise() only subscribe to upstream once" into tm-qpr-dev am: a117bbe3 am: b1fe9afd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19827976



Change-Id: I1e26255dec80794c62f261f2b3496f89bef06d2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>