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

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

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

Change-Id: I5a91ca8d16746c7f8f203e7bfedce69025a0b3b3