Merge changes from topic "presubmit-am-ebb30f757e84472c86693a80953f851a" into...

Merge changes from topic "presubmit-am-ebb30f757e84472c86693a80953f851a" into sc-qpr1-dev am: 8491a267

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

Change-Id: Ic8e719eba116364879efcd5fca3403734097eab7