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

Merge changes from topic "presubmit-am-ba0ca280754b426bbc91a336347cfd0d" into tm-mainline-prod am: 2965f6bc

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



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