Merge "Merge "Mark updatable APEXes" into rvc-dev am: 71796e31 am: f38631a5" into rvc-d1-dev-plus-aosp