Revert "Revert "Removing deprecated APIs added to Q""

This reverts commit 1600c5a6152d0e643d6eab1896f798ec5d9a2439.

Reason for revert: Rolling forward for Q-Finalization

Bug: 129975435
Change-Id: I1ffb8162cb5e6f386fd3c417fabfd4298ef86ffd
(cherry picked from commit cece8d3bd5dbc4d045d0012f0de253bd088b33f4)
3 files changed