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