Merge "Fix parser bug ignoring user id." into main am: 709b9568 am: a854bc31 am: 6d9c1d54

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2781947



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