Merge "Merge "Fix issue with" into rvc-dev am: a1596ea5 am: 89dc94eb" into rvc-d1-dev-plus-aosp am: ace86bd5

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

Change-Id: Ib035a7c458900b0018101290fd4eea1e56775063