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

Bug: 111615259
Change-Id: I99f7f3a33e7a08dd35b39b8a405cae1b341c46cd