[DO NOT MERGE] Resolve file inconsistencies between master and tm-qpr-dev

Bug: 229771520
Test: Manually checked the device build
Change-Id: I03bf5eac968b425344236fbea897501bc5ecbeec
2 files changed