Merge changes from topic "am-33470befccb74b399ba8484212c404fd" into sc-v2-dev-plus-aosp
* changes:
Merge "RESTRICT AUTOMERGE: Fixed permission issue in car shell" into sc-v2-dev am: ae6ee91e
RESTRICT AUTOMERGE: Fixed permission issue in car shell am: 758a68da