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

Merge changes from topic "presubmit-am-fc678d3c881c4b0dae8f067ca6b975e4" into tm-mainline-prod am: a0491f24

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



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