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

Bug: 172690556
Merged-In: I72c68d007e8837b826b67502ece166714095ebf3
Change-Id: I52bfb3e6c7fb46fe70046a0db9b1c0de41a643e1