Bug 1058330 - Use the 'geolocation-noprompt' permission in Find My Device r=mgoodwin
Merge pull request #23768 from guilherme-pg/v2.0

Bug 1058330 - Use the 'geolocation-noprompt' permission in Find My Devic...
Bug 1054827 - [FTU][FTE] "Enter PIN code" for SIM2 page flashing and keypad not shown after flashing stops

Conflicts:
	apps/system/test/unit/sim_lock_test.js
Revert "Bug 1054827 - [FTU][FTE] "Enter PIN code" for SIM2 page flashing and keypad not shown after flashing stops"

This reverts commit 35533237253ff5a27e9301a9031c4cc4b1d95eb5.