Merge "Add a new system-to-vendor sysprop ro.apex.updatable"