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 am: 8257e065

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



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