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

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

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



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