DO NOT MERGE: Merge pi-dev-plus-aosp-without-vendor into
stage-dr1-aosp-master

Bug: 111615259
Change-Id: Iff6b584b9b400bd67eb27b8ad2d0d81d3155b4ba