Merge changes from topic "presubmit-am-32698aa12e6f46839a1d4707427a6868" into...

Merge changes from topic "presubmit-am-32698aa12e6f46839a1d4707427a6868" into tm-mainline-prod am: a5792901

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



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