Merge changes from topic "presubmit-am-368b5e63ab404c84b18fb4dfba552be2" into...

Merge changes from topic "presubmit-am-368b5e63ab404c84b18fb4dfba552be2" into tm-mainline-prod am: 57c46a5e

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



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