[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: d1cb414049 -s ours am: b2382cc665 -s ours am: de9f57460e -s ours am: b723db42ec -s ours

am skip reason: Merged-In Iefc43953a0d9e45162574479fa889acd7930b32d with SHA-1 076a479951 is already in history

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

Change-Id: Id270a91c68d032deed83fc1b91d1e7709eafafab