Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 16679604cc
am: 468fb2c6bb

Change-Id: I321c61df60512dd2802c5d98536c839097f3b457
tree: cee8ec6a79820d9a3574cfb584246cedac8434c6
  1. PermissionController/