Merge "Remove a bunch of deprecated @SystemApi." into oc-mr1-dev am: c2e09129e0
am: b2a9f55488

Change-Id: Ib7e00ad3b02bf62fad1cc32c9e6002b2b7a45369