Merge changes from topic "presubmit-am-252b792357dc4ac5acfe8cd7389f8771" into tm-mainline-prod am: b97f3a87

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



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