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

Bug: 111615259
Change-Id: Iea3f3b437b8aff9c238979690d9781c573885a4c