[automerger skipped] Merge "DO NOT MERGE Remove toolbar layout from -port folder" into qt-car-dev am: 38f9bd0916 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/libs/+/12699478

Change-Id: I95c1d0556ddb64ff002e69c0934ddd0466144ebf