Replace references to private APIs

This does not touch car

Test: Build and compare before/after screenshots of affected components
Bug: 130871088
Bug: 124489023
Change-Id: Ic0526f31941dc22f08a0e6d11a03e03c030d2cc8