Merge changes from topic "presubmit-am-28eaceeb106d4ecb9a115fcdbff92b92" into...

Merge changes from topic "presubmit-am-28eaceeb106d4ecb9a115fcdbff92b92" into tm-mainline-prod am: 8614c6e2

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



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