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

Bug: 111615259
Change-Id: If0ef925301b9ed139ad2e09c3bf5b97a97580e6b