Merge "Rename uses-permission-m to uses-permission-23" into mnc-dev