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

Merge changes from topic "presubmit-am-c0a85a4281464732aaab0204b1f5d2be" into tm-mainline-prod am: 2ab3b981

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



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