Merge changes from topic "b192331240-singleInvoke" into tm-dev am: ac9ae5d9 am: 32457a33 am: dfd8acd0

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



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