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

Merge changes from topic "presubmit-am-b01dd9a0ec884748ae6b76d4b4ae9935" into tm-mainline-prod am: c8d378df

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



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