Merge changes from topic "original-package-fix-rvc-qpr-dev" into rvc-qpr-dev am: 960ffca1

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

Change-Id: Ibc27add1213a2b37b869b5c53620155198d8aa15