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

Merge changes from topic "presubmit-am-f8f90cb26a3349e3a5607b39dd25e0d1" into tm-mainline-prod am: a3ef2e82

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



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