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

Merge changes from topic "presubmit-am-bc2be7c4df6a468b8e83549b04798445" into tm-mainline-prod am: a2ba1b09

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



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