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

Bug: 79597307
Change-Id: If170c6fcc0469583a326fcd4d92836fec281427e
tree: 256d681c8a15165facd99993a5373518ba45c596
  1. amber/