Remove unused code (3/n)

(Cherry-picked from 2f777b39b741727c1cee28f8e2b72c5737a32c33)

Bug: 149663536
Test: m
Merged-In: Ia233ca642d58b7b6a0984359ea11958f8d9a8ff8
Change-Id: Ia233ca642d58b7b6a0984359ea11958f8d9a8ff8
4 files changed