[automerger skipped] Merge "Ensure location permission re-granted on re-bind...

[automerger skipped] Merge "Ensure location permission re-granted on re-bind to system dialer." am: f777c69d am: 3762a6c8 -s ours am: 2e2df001 -s ours am: ffda7bd8 -s ours am: dc5360d7 -s ours

am skip reason: Change-Id I1e1dbfd632b6d82cdd3bbad19de6aaeaf28c2dab with SHA-1 9307d26c is in history

Change-Id: I862674af28ef95c8fb8226c9b583c4268163bc7b