Merge changes from topic "presubmit-am-564566ba5b6d4ddbb308aff0c5330d99" into...

Merge changes from topic "presubmit-am-564566ba5b6d4ddbb308aff0c5330d99" into tm-mainline-prod am: f436c051

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



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