Merge changes from topic "presubmit-am-5f71c0c2e4404f4483b93bae95744fe7" into...

Merge changes from topic "presubmit-am-5f71c0c2e4404f4483b93bae95744fe7" into tm-mainline-prod am: 41dbbcc9

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



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