Merge changes from topic "am-78efe437ad0b41f892ed86ce7e90fb70" into sc-qpr1-dev-plus-aosp am: 5084743b

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

Change-Id: I44e985d7754baf3892bd618a720a6351a882240a