Merge changes from topic "presubmit-am-9d5049bfa1a8471b993fab8258f038b4" into...

Merge changes from topic "presubmit-am-9d5049bfa1a8471b993fab8258f038b4" into tm-mainline-prod am: 5e965cd4

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



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