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

Merge changes from topic "presubmit-am-eaed8ad228db4e0992b91a3d0667fb78" into tm-mainline-prod am: 0207a743

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



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