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

Bug: 172690556
Merged-In: Ib6b72ef12bfc7ab458c82e55c0acaf130a92c722
Change-Id: Ic862688d4a92b2100fc53f16e67dacf99226ce24