Merge changes from topic "presubmit-am-218000508aaf47d2b61c6061d6c83dc7" into...

Merge changes from topic "presubmit-am-218000508aaf47d2b61c6061d6c83dc7" into tm-mainline-prod am: 0ca6c76e

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



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