Replace some hidden API/constant usages with public/system alternatives.

Test: basic sanity
Bug: 137202333
Merged-in: I32559848ad812ad42d931f5e6d3488ceec9dcb8d
Change-Id: I32559848ad812ad42d931f5e6d3488ceec9dcb8d
(cherry picked from commit b8f132016ce71382ebe154e909589f04942d0a6b)
6 files changed