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