Merge "Change Browser location pre-grant to fg-only" into rvc-dev am: 99c0b6d118 am: 4ab223f223 am: 069f46d181

Change-Id: I0b96f6c57755b7d122777e04a8ec58663407ada8