Merge "Deprecate SystemApi that was accidently made public in P"
am: 18870b2e4e

Change-Id: I235d5466ac67e60d4cf59c28131c30421fbfd18c