BMS: keep userHandle during User switch retry

Pass the userHandle directly and change method name since it is not a
generic method but specific to userSwitch
Also MESSAGE_USER_SWITCHED will now keep the user it is switching to in
it

Bug: 262605980
Bug: 285046954
Test: None | no-op change
Change-Id: I8e37744aa85acc3596480b741b953cb1dae04668