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

Merge changes from topic "presubmit-am-b3cb1be8a230487d8bec0d1ac2f63c12" into tm-mainline-prod am: c97bf5e5

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



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