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

Merge changes from topic "presubmit-am-bfd35cff07c94970be738a923af0d67e" into tm-mainline-prod am: 96209510

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



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