[automerger skipped] Merge "Replace some hidden API/constant usages with...
[automerger skipped] Merge "Replace some hidden API/constant usages with public/system alternatives." am: 2c979cd6 am: e9197d68 -s ours
am skip reason: Change-Id Ia6bd4483ab29c1d2ac06412b6cbe63b13d55673d with SHA-1 c51a4903 is in history
Change-Id: Ib5378c86bf36adafe6cadbc07a402ede5591ae5a