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

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

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

Change-Id: I3a15dd27985c1d7b2323ec63d5a3e641274d4da1