Merge changes from topic "presubmit-am-854e87546f4d480bac0403b988c53fe4" into...

Merge changes from topic "presubmit-am-854e87546f4d480bac0403b988c53fe4" into tm-mainline-prod am: 2f127bbb

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



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