Merge changes from topic "am-c7a740ec19094812ac51a44d785d14ff" into rvc-qpr-dev-plus-aosp am: d12cfa7b

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

Change-Id: I72a95a5903801b780fea954f25a1dfc1167869ad