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

Merge changes from topic "presubmit-am-f32a9ce9fda74f40a85b95c58d8bec40" into tm-mainline-prod am: e76e4927

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



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