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

Merge changes from topic "presubmit-am-ebb30f757e84472c86693a80953f851a" into sc-dev-plus-aosp am: 82a5099a am: edde0b74

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

Change-Id: Ic358bb213e5e6b150e05f90b6a6c1312c7672e82