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

Merge changes from topic "presubmit-am-a5fa8982e1d2485b87e8b5491721b947" into tm-mainline-prod am: f0c02add

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



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