tree 89a8974c39be811e130d4ea140ea1a56154be641
parent ed85c7d201916b17fd12b162f6596c9160e7ea78
author Amit Mahajan <amitmahajan@google.com> 1580177767 -0800
committer Amit Mahajan <amitmahajan@google.com> 1582663338 -0800

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)