Merge "[Mainline] Make @SystemApi and add permission for mainline"