Merge changes from topic "presubmit-am-9dbd7e051cf943fc942deabc250323f4" into...

Merge changes from topic "presubmit-am-9dbd7e051cf943fc942deabc250323f4" into tm-mainline-prod am: d9baad42

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



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