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

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



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