Merge changes from topic "am-e5dcd8a701914fd5b5a70802fb38c887" into...

Merge changes from topic "am-e5dcd8a701914fd5b5a70802fb38c887" into sc-qpr1-dev-plus-aosp am: df77a032 am: c1669862

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

Change-Id: Ic3c5b4a4f53719c5baa9e0e95619a1e450d206bf