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

Bug: 111615259
Change-Id: I968874ba7a43a087db73272e90e3e2c1572f7dde