DO NOT MERGE - Skip rvc-qpr-dev-plus-aosp-without-vendor@6881855

Bug: 172690556
Merged-In: I1bbbbaa1d9eb843a8f6f8150ba56db425f695b54
Change-Id: I82fdd508d52d67d196e930ccef2b8c33ff7a503e