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

Bug: 111615259
Change-Id: I0bbc44c97afd0ed6ff7799e866d4b36beee6c3be