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

Merge changes from topic "presubmit-am-eef876b2f2b74ea88f9600c9f6303507" into tm-mainline-prod am: b1853081

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



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