Merge "Adds necessary permissions to system apis" am: b4a5933a62
am: f3b169c8e6

Change-Id: If10e10963cedfe4b19e57d3b26a6c4113985757f