Merge changes from topic "am-e5dcd8a701914fd5b5a70802fb38c887" into sc-qpr1-dev-plus-aosp am: df77a032

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

Change-Id: I93799d0eee91310ce2bc3fefba042c7f12e7b4b3