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

Bug: 111615259
Change-Id: I5fa45da109f19a68a4256098f3e5071bb35a9d7a