[automerger skipped] Merge "Add min_sdk_version:R to updatable apexes" am: c280c85504 am: 6478508103 -s ours
am skip reason: Change-Id I4a893c34b09334eea124266287301e479b9e8a59 with SHA-1 f1460fad52 is in history
Change-Id: I8eba2377180a9cf279775bdcb6a1c7556c3a661f
This commit is contained in: