Merge changes from topic "presubmit-am-335ee473d7cb4dadb108ad355f225ba9" into...

Merge changes from topic "presubmit-am-335ee473d7cb4dadb108ad355f225ba9" into tm-mainline-prod am: 94b64c46

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



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