[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: c943bd1099 -s ours

am skip reason: Merged-In I78845f2ff01e523e988cb2682d04c732871d7288 with SHA-1 fb0e5e5273 is already in history

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

Change-Id: Iac585506b30b48c3305439031b094baf09be2397