Merge changes from topic "presubmit-am-83614c0b76a14ebc87638664e51ddec9" into...

Merge changes from topic "presubmit-am-83614c0b76a14ebc87638664e51ddec9" into sc-qpr1-dev am: cdb0a1f4

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

Change-Id: I380a2e65be35f8318a28fc9c2dac82ae2e3c7fd9