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

Bug: 111615259
Change-Id: Ibfe5ccecbcdc8401c226ad11fddf7da03ea430c9