[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 1603a390d9 -s ours

am skip reason: Merged-In Iaa58fca12b868b2bcbf80d8c57b1199d3f5906eb with SHA-1 1f0a09988e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libavc/+/15571685

Change-Id: I6fa9fe989babaff97fc84a7caf0c0e46f04a0f24