Merge changes from topic "presubmit-am-943e284c245b476c8b9d52d96160aedb" into sc-qpr1-dev am: 28dbc918 am: 99669a9d

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

Change-Id: I71f6a2f5168e0e7b7ce0f5e7590b1e1554c43956