Merge "Deprecate SystemApi that was accidently made public in P" am: 18870b2e4e am: 1cb491e423
am: 81304407aa

Change-Id: I4b8d90f70f2daae91186d2434b97166fc8b7ae8f