Merge "Add min_sdk_version:R to updatable apexes" into rvc-dev am: 6a4a96c74c

Change-Id: I531247560c84d3cc49459d340f6c2d6cf6b31141