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

Merge changes from topic "presubmit-am-b1cc9d9e3dad412d9acad96cb1eab657" into tm-mainline-prod am: 7897f029

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



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