Merge changes from topic "presubmit-am-419f1791ccd244ffbdc17659daf109a8" into...

Merge changes from topic "presubmit-am-419f1791ccd244ffbdc17659daf109a8" into tm-mainline-prod am: 0890531b

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



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