Android T Preview 1
Merge "Switching to the relevant SystemApi instead of the the @hide API"