RESTRICT AUTOMERGE Remove deprecated System APIs added in Q.

Test: Builds, boots
Bug: 129975435
Change-Id: I4bfd0bfbbc52b7822477ec0c70a08de6f85a3672
10 files changed