Merge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev
am: 57132a1513

Change-Id: Ic29e989b13f2a9d4d53b403f3bdc1b1c46145e45