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

Bug: 111615259
Change-Id: I163f7e7f3f608b42ab473ed55f58f853f8433703