Merge changes from topic "presubmit-am-9775583256df468cab6420b6719fce49" into sc-dev-plus-aosp am: 96825f7a15 am: 2f5f1ee981

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

Change-Id: If912aec9dbb42b82fd7ec1711f7a90bd6b34c258