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

Bug: 111615259
Change-Id: Iddaed14a9f6a6d27007db09d27c50eea07a4098b