Merge changes from topic "am-577b97fffd494da6ab23ae7216fd6550" into sc-qpr1-dev-plus-aosp am: bd269cdf

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

Change-Id: I94508e8c1e7c706eaef28cfba0f3b28c3a6da136