Merge changes from topic "presubmit-am-1ac371c403834269a544bcf0f0541c11" into...

Merge changes from topic "presubmit-am-1ac371c403834269a544bcf0f0541c11" into tm-mainline-prod am: 5f35294f

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



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