Merge "Change hasRequestRawExternalStorageAccess() to return integer" into sc-dev