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

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



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