Add @TestApi for field needed for test

Also update truncated comment.
Bug: 13249737
Bug: 77485791
Test: CTS

Change-Id: I1351a6ef28dfd7e881f32830c436315ffdbfffaa
2 files changed