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

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

Change-Id: I818c7bcea88c4976c54f660ce2c72db7f1339582