Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855

Bug: 172690556
Merged-In: Ic679a38e6311058f96e1ec4e58ce2645575fabe6
Change-Id: I8f156bb25910d3ff09f52f963694f0e060d308dc