Merge changes from topic "presubmit-am-b8c92f3352a44b68aa16fbbc6837c783" into...

Merge changes from topic "presubmit-am-b8c92f3352a44b68aa16fbbc6837c783" into tm-mainline-prod am: ac1bd8a6

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



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