Remove file causing auto-merge conflict from tm-qpr-dev

File is removed in ag/20594507.

Bug: 260777356
Test: none
Change-Id: I7549b12906e0abc0190c7813ce0f2e2495ab83c3
1 file changed