Removing unused screen records

Bug: 187761685, 195673272
Test: presubmit
Flag: N/A
Change-Id: I87711d246660d917cf7e09ac4ffd714149563e52
2 files changed