Merge "[2/2] Add a whitelist for location providers outside of /system" into p9.0