Merge changes from topic "presubmit-am-07fbc24475da4c549999999d34e98894" into...

Merge changes from topic "presubmit-am-07fbc24475da4c549999999d34e98894" into sc-qpr1-dev am: 20b7fa7d am: fa0006d6 am: 15c10661

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

Change-Id: If81e9468d198ac1422b5f8455692f24a285dbbed