Merge changes from topic "am-972234a1128d41e38f2888eefcea5f48" into sc-qpr1-dev-plus-aosp am: 0fbac847

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

Change-Id: I9c6c7bddec45ab877e50ec04fa48b0bf8f932e06