Merge "Revert "Revert "getCallingSid: get calling security context""" into pi-dev-plus-aosp