[automerger skipped] Merge "Master is now designated for R. Update...
[automerger skipped] Merge "Master is now designated for R. Update MAX_PLATFORM_VERSION, etc." am: 91871f36
am: 6aeacea8 -s ours
am skip reason: change_id I352e02484fa73ee924c84846913b93f7713c77ef with SHA1 a30a28ff is in history
Change-Id: Ib6798b18b5775fa6036c6568084da4a24f472cd5