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

Bug: 111615259
Change-Id: I04af9dc88bfabbf3e69c93917e6116f58fffbc3f