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

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

Change-Id: Id22a6f22a7f4b61e1728d184504324f35e06f796