Upcoming change will make subIds public and not redacted but this change
will make cts fail.
So this CL updates test to be compatible with current code and code with
planned changes.
After the current cts support window is over, subIds can be public.

Bug: 324357121
Test: TH, TH with aosp/2969321
Change-Id: I45d39f5bc3b1c4af26cc990ce29b45e9ad7d3c3c