Merge "Fix failed ProfileSwitcherTest" into udc-qpr-dev am: 6efca5a159 am: cd250b2f4b

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

Change-Id: If5de68587fc7629232d1bcb420a3dc9263731136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>