Merge changes from topic "presubmit-am-4af7c72a3ef84c01ade42047ba306467" into tm-mainline-prod am: d225bc58

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



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