Merge changes from topic "presubmit-am-9863077b6245445fa6d0b447dd170c6f" into...

Merge changes from topic "presubmit-am-9863077b6245445fa6d0b447dd170c6f" into tm-mainline-prod am: 25e2a5e4

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



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