Merge "Merge "Change Browser location pre-grant to fg-only" into rvc-dev am: 99c0b6d118 am: 51e8964356" into rvc-d1-dev-plus-aosp am: 336937762c

Change-Id: I0ff453225360b53d18cf9707458802dac8176e04