[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: cb30351e81 -s ours

am skip reason: Change-Id I1afb58af0871db263d9d6b0d28bb1b5e7455d275 with SHA-1 be040abccc is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Music/+/12469549

Change-Id: Icd25f8a54e67969601f26f01e4c9634d6b3ee1fa