Merge "Reduce extra connections made to app" into tm-qpr-dev am: a88f7383...

Merge "Reduce extra connections made to app" into tm-qpr-dev am: a88f7383 am: fd4d4306 am: ad6d0f29

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



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