Merge changes from topic "original-package-fix-rvc-qpr-dev" into rvc-qpr-dev...

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

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

Change-Id: I1b80748d924e3565b261c19928fd70ed63b07005