Use public alternatives to hidden APIs

Bug: 137202333
Test: manual
Change-Id: I640e2f33e5ae49e7efa3091322aa151c8a82adc8
Merged-In: I640e2f33e5ae49e7efa3091322aa151c8a82adc8
2 files changed