Merge "Remove CAR_CAMERA permission from CarService Manifest" into pi-dev
am: ebab4277c4

Change-Id: I784996fd5ad0146f371e975a0578e7f844127811