Android T Preview 2 (TPP2.220218.010)
Merge "Switching to the relevant SystemApi instead of the the @hide API"