Merge "[automerger skipped] Updating platform SDK version for R am: 38cd221d...

Merge "[automerger skipped] Updating platform SDK version for R am: 38cd221d -s ours am: 0585f9e3 -s ours" into rvc-d1-dev-plus-aosp am: 903a851a -s ours am: 06c1421c -s ours

am skip reason: Change-Id Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d with SHA-1 38cd221d is in history

Change-Id: I10b213ef29d178c042c6ecbc03269f6b51518511