Merge changes from topic "presubmit-am-e4978075937f4e43aa46e37caf0dc425" into sc-qpr1-dev am: 9a1f59b4c8 am: 8af870eb95

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

Change-Id: I23e8481b05a9f339c152afeb244f8e8ba5198245