Merge changes from topic "presubmit-am-ea374dd0fc9847428966bc496256e6cf" into...

Merge changes from topic "presubmit-am-ea374dd0fc9847428966bc496256e6cf" into tm-mainline-prod am: 7d33729d

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



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