Merge changes from topic "presubmit-am-113ea0b1e61044879f26b0af635243d4" into...

Merge changes from topic "presubmit-am-113ea0b1e61044879f26b0af635243d4" into tm-mainline-prod am: 9a50fa8a

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



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