RESTRICT AUTOMERGE Removing deprecated APIs added to Q

Test: Builds, boots

Bug: 129975435
Change-Id: If083957effedf7987b200c366f65d6863b99bca1
3 files changed