Merge changes from topic "presubmit-am-e4978075937f4e43aa46e37caf0dc425" into...

Merge changes from topic "presubmit-am-e4978075937f4e43aa46e37caf0dc425" into sc-qpr1-dev am: 9a1f59b4 am: 03451e6e am: 79e58c97

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

Change-Id: I5c2a0c9621a4282c84ad6d0d456a615ddfdf1734