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

Bug: 172690556
Merged-In: Ief2d409729de9413224773906ff892ea62893635
Change-Id: I7bc25bb7bd3bbfa255e399def0a786d3200bb737