Merge "Store MCC and MNC as system properties on userdebug builds."