Merge changes from topic "presubmit-am-4422f41113a3447c8dda8766b9563550" into...

Merge changes from topic "presubmit-am-4422f41113a3447c8dda8766b9563550" into tm-mainline-prod am: ca133319

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



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