Merge "Fix parser bug ignoring user id." into main am: 709b95686e

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

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