[automerger skipped] Merge "Replace some hidden API/constant usages with public/system alternatives." am: 95b842968d am: 5f657130f7 -s ours am: 93473590fc -s ours am: 9f7fe4df83 -s ours
am skip reason: Change-Id I32559848ad812ad42d931f5e6d3488ceec9dcb8d with SHA-1 b8f132016c is in history

Change-Id: I6843889d97ebc9c009e422f106620b009cd26086