Merge changes from topic "presubmit-am-c27cc2cb34a242dc93218b4b3bf88db3" into...

Merge changes from topic "presubmit-am-c27cc2cb34a242dc93218b4b3bf88db3" into tm-mainline-prod am: ec5ee3c6

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



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