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

Bug: 79597307
Change-Id: I032654174f91c057b36f9b9a71071bdbd2383a2a
tree: cb068f225fc053c7b6ec9c80323ec03729c35f92
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml