Merge changes from topic "am-f3e9077f8fe1411bbc50f696d9ebb63d" into sc-qpr1-dev-plus-aosp am: 6d05d5ed

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

Change-Id: I7e1344eac386ee04908feda016eaf91898899093