Merge changes from topic "am-f368fa6bf3914018a6154cb739498149" into rvc-qpr-dev-plus-aosp am: a8256e19

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

Change-Id: Ib320c2cdfdc25ab1e9c80a2514df28f560a5f0a9