Merge "Merge "Cleanup after updating Vehicle permissions" into pi-dev am: 8b73c1126a" into pi-dev-plus-aosp
am: 71d4627435

Change-Id: I49cfde77edac42e70f7ee6e41bbcc506954ba4f0