Sync QPR1 branch with AOSP

Bug: 144880252
Test: Build pass
Change-Id: I124e4a039ee0d85fcab758adfbb9578eda17cc2e
2 files changed