Merge changes from topic "am-dbf0c50c07294c019eff776390e2ac1b" into sc-qpr1-dev-plus-aosp am: 800b118e22

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

Change-Id: I089defd92a5516ce59fcd576553a64a4aaf73cf5