Merge "Defer writes to runtime-permissions.xml" into mnc-dev