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

Bug: 172690556
Merged-In: I033b34904a3fc44e86b556e3350b664b2ea3f13c
Change-Id: I6d4b7dd6b6fbf27c1b8613fb48a61f2381fdcc9f