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

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

Change-Id: Idfbe28db0da752a30a65a0385574cfd5c592d2e2