Merge changes from topic "presubmit-am-9b95e1db2c474672a9f1a4c7c43d99d0" into...

Merge changes from topic "presubmit-am-9b95e1db2c474672a9f1a4c7c43d99d0" into sc-qpr1-dev am: 87b6e36d am: 10023bc0 am: 9505f6d4

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

Change-Id: Ib15ab0b1f016a3d5333d1127b3fd08681e2f2edf