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

Bug: 111615259
Change-Id: Id1c6564b1bbec624587f1ec1968256c87d1e4f8a