[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 6395eb500b -s ours am: 132e270205 -s ours

am skip reason: Merged-In I74c20512b392f8eef0dbf98c085d812a8a4d6c57 with SHA-1 e4e22ed331 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/16845237

Change-Id: Ie15da1c80090aebaa4a11ee0150eb997ab795412