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

Merge changes from topic "presubmit-am-ebb30f757e84472c86693a80953f851a" into sc-qpr1-dev am: 8491a267 am: 5de85ec0 am: ba84751f

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

Change-Id: I97dcec6ab643e025c2517aa617292dccfe7d901c