Merge "Test that uid 0 isn't dropped in proto to text conversion." into main...

Merge "Test that uid 0 isn't dropped in proto to text conversion." into main am: 941fc297 am: 7691d557

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3531630



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