[automerger skipped] Merge "DO NOT MERGE Skip or modify related tests which are not relevant for car" into pie-cts-dev am: 1c3e3e7ffb -s ours am: bf8a38f720 -s ours
am: 2ceaa75a77

Change-Id: Ib967f7065638b3fe7195e3881531bac08119b167