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

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

Change-Id: Ifcf05da832dc67611c4610e15f81232c79508f86