Merge changes from topic "presubmit-am-67ba33c090484110ac10516a3ae9f95e" into...

Merge changes from topic "presubmit-am-67ba33c090484110ac10516a3ae9f95e" into sc-qpr1-dev am: f30cd26e am: 9b240318 am: e5fa5c60

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

Change-Id: I9c19b4d9af3e5e91cc63b3de650b644591fdfa01