Merge changes from topic "am-50f43ad525e5485685514546a1930347" into...

Merge changes from topic "am-50f43ad525e5485685514546a1930347" into rvc-qpr-dev-plus-aosp am: bd5658dc

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

Change-Id: I6b3de56371fef1d5647484e35ad13fb55c463a2a