Merge "Adds necessary permissions to system apis" am: b4a5933a62 am: f3b169c8e6
am: 19fc73f8dc  -s ours

Change-Id: If082278ab91e01852155afc1748474a937d7faae