Merge changes from topic "presubmit-am-97a80aab5ba84beca97379d231545146" into tm-mainline-prod am: c9809a2e

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



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