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

am skip reason: Change-Id Ia4252557017a3f7dc4e40a4e006994becdcfc77f with SHA-1 1508d88344 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/layoutlib/+/12484866

Change-Id: I9b09b74abc0d4840657496a120b295712ebc4f77