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

Bug: 111615259
Change-Id: I78f39f6dbf92aab13c829077b1d0fd4e48f7caa2