Merge "Mark location-related PendingIntents as restricted" into pi-dev
am: b3ac00ea9c

Change-Id: Ie9ca7886858033c2ca46d090d46e74679b4e0c23