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

Bug: 111615259
Change-Id: I46655cee853d8d08d62969078def687c72cb5909