[automerger skipped] Merge changes from topic "am-fbb7d69405df43e986f4ea2a65ac12d8" into rvc-qpr-dev-plus-aosp am: 5c64d5c1e2 -s ours

am skip reason: skip tag Change-Id If817b15b8e994bbbcf0ce19e00948cd8791e19d1 with SHA-1 d228ff4686 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/13914945

Change-Id: I02e697e7e6685b0955333743c7f94a50a37e4692