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

Bug: 111615259
Change-Id: I83e2dc6e7c207dff34a01d7b9301f4642617fd16