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

Merge changes from topic "presubmit-am-d23de3d9ce574ee3a191da60a6811105" into tm-mainline-prod am: 8eeaa678

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



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