Merge changes from topic "presubmit-am-972dcb5456b14246b20e89e741cf7eaa" into...

Merge changes from topic "presubmit-am-972dcb5456b14246b20e89e741cf7eaa" into sc-qpr1-dev am: 8b9ef48f am: 92d60b46 am: dbf8e26b

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

Change-Id: I0a6adc081c14dc8e1c2e4a8b214b20209117a02e