Merge "Fix testUidPoliciesToString"
am: c8613f9965

Change-Id: I3ec2fd01ca55ef63d0bfe0cec48854f852c736cc