Re-add removed APIs per API council feedback.

Some APIs were removed erroneously in the Q release; these methods were
just deprecated in Q,

Test: Make API, build
Bug: 116801893
Change-Id: I38ddf8bcd9fe39f4ba50bc892ac2f6d20209f7a9
3 files changed