Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master

Bug: 111615259
Change-Id: Ic1ea7985354fdb1869c61aca89cc00484d7a0be7