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

Bug: 111615259
Change-Id: I704ad93710419b1427377f16e4195f32a0a31ba0