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

Change-Id: If7607e2a2f8043e2a4f5a57738c98bc7361f8a5e