Merge changes from topic "presubmit-am-eaa97beb2f6a4393b8a652f43ac1a987" into sc-dev-plus-aosp am: 5133c2ae

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

Change-Id: I1420211dff027c7ff18f21ae3c133392d0ea40f3