Merge "Fix CtsIncidentHostTestCases for RVC AAOS emulator" into rvc-qpr-dev am: 013474d332 am: c4abf3dcd9

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

Change-Id: I48dffbdb80ded1a7e49a6951a14063241e117f9d