Merge changes from topic "presubmit-am-1a5e8be9647b40b7903a5d55661acee3" into...

Merge changes from topic "presubmit-am-1a5e8be9647b40b7903a5d55661acee3" into tm-mainline-prod am: 171d8438

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



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