Merge changes from topic "b192331240-singleInvoke" into tm-dev am: ac9ae5d9 am: 462af14e am: 03c543a1

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



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