[automerger skipped] Fix UserdId value when beam is not supported am: a6ff0189e7 -s ours am: a233df81ff -s ours

am skip reason: Change-Id I1b0d9270dd7f6d1b891010706c11d7125aeee369 with SHA-1 035767cda4 is in history

Change-Id: I1b3c3fcf287800433a5093e236e97f6588338768