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

Merge changes from topic "presubmit-am-d0f0229ad5b54fdb90e9cc2df6755516" into tm-mainline-prod am: 876efb05

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



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