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

Change-Id: Ieafcc2c15eb0b7a2968faf979fe93e31088e86b5