Android S Preview 1
Merge with history of PermissionController

Additionally fixes the import path in
src/com/android/permissioncontroller/PermissionController.proto

BUG: 167963264
TEST: TH
Merged-In: I16cc0e9742f196de9afbecc1bf0788c2f12bc4d0
Change-Id: I804e73f856929892266cffc5f950fa79368fb2a3