Merge "Replace some hidden API/constant usages with public/system alternatives." am: 95b842968d

Change-Id: I14ce0f98e68f582d9a03b7e65acc931f7341b28b