[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 9f6624c411 -s ours

am skip reason: Change-Id Ifa05e30dabc9da3b5ecd25138b04da5fb196f475 with SHA-1 b6add02184 is in history

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

Change-Id: I02fbdb76ffe0a9a69a9920d3b318e2596a9a72ab