... in preparation for creating a stub library from services.jar Bug: 139391334 Test: m Exempt-From-Owner-Approval: cherry-pick from internal Merged-In: Ifd6cfc77acf2284804a2f64011c2733b5c222369 (cherry picked from commit bae2e907966dce0cb3eaf3e3a81cca4364b7d941) Change-Id: Ifd6cfc77acf2284804a2f64011c2733b5c222369