Merge "Don't drop runtime permissions on older system app update." into mnc-dev