Merge "[automerger skipped] Updating platform SDK version for R am: ab8e4655dd -s ours am: 0d35a61b56 -s ours" into rvc-d1-dev-plus-aosp