Merge changes from topic "am-2939ec81b46a4353bcae6fdff7a1a6e1" into sc-qpr1-dev-plus-aosp am: adfd7056

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

Change-Id: Ieaa4adb910973b769aa993fbaf50665bf5e26998