Merge changes from topic "presubmit-am-24469baaaea546dbbf9bbf95e81771ff" into...

Merge changes from topic "presubmit-am-24469baaaea546dbbf9bbf95e81771ff" into tm-mainline-prod am: a594bfeb

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



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