Merge changes from topic "presubmit-am-9b5e750ffe3a4cb798418c89d9e7f523" into...

Merge changes from topic "presubmit-am-9b5e750ffe3a4cb798418c89d9e7f523" into tm-mainline-prod am: 27e8c4c0

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



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