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

Merge changes from topic "presubmit-am-ea18b7bdcd494f359caebde79f549279" into tm-mainline-prod am: 6035871d

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



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