Merge changes from topic "presubmit-am-32f14c30420c44f88650ca750b09d4d7" into...

Merge changes from topic "presubmit-am-32f14c30420c44f88650ca750b09d4d7" into tm-mainline-prod am: e31c8928

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



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