Merge "[automerger skipped] Fix UserdId value when beam is not supported am: a6ff0189e7 -s ours am: a233df81ff -s ours" into rvc-d1-dev-plus-aosp