Merge "Removing some of the API don't have to be @SystemApi" am: 66a82eecd2

Change-Id: I6687ba646982ea924feae7d8da6732a04184321e