Merge changes from topic "presubmit-am-9775583256df468cab6420b6719fce49" into sc-qpr1-dev am: 761f529f

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

Change-Id: I3336b036831499eb37d71e19e9360306adbda147