[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 302c1e6fb3 -s ours am: e7947fced0 -s ours

am skip reason: Merged-In I1c81d844eb6602f5c7704ff5c2ef816e2ebe89d2 with SHA-1 07fa6feb4d is already in history

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

Change-Id: I2e46f0d13f94d168ab136965a52d45c678268d8b