Merge "Update to the correct view tag for CarUiBaseLayoutToolbar" into rvc-dev am: 3987af87cb am: 44a3dcd47e am: 8a4b6ae6ba am: 14ff707bc0

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

Change-Id: Ifb1575c6282ebba726bfeb4cf0d07899448f8247