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

Merge changes from topic "presubmit-am-d5d1c12250244853a71c033299605b35" into tm-mainline-prod am: d8c3bc8a

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



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