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

Change-Id: I6b5d176ddb999cc43cbe26d96dc513fa4c3a8f93