Merge changes from topic "presubmit-am-8d883627a9574b68b4fda59a733f3476" into tm-mainline-prod am: fa91305e

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



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