Merge changes from topic "presubmit-am-9522a5e1392b4268a1792fcf81596629" into...

Merge changes from topic "presubmit-am-9522a5e1392b4268a1792fcf81596629" into tm-mainline-prod am: 285f6a18

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



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