Merge "Make getExternalStorageMountMode as SystemApi" into sc-dev