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

Change-Id: I5338a510ef2c62cf1b9c777aa1f76c8479224387