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

Bug: 111615259
Change-Id: If05ea0b23b2eaf71d67380747bb8903b060d9ffc