Merge "Give some members mPrefixes for consistency." am: 5fa961d291 am: be426518f7

Original change: https://android-review.googlesource.com/c/platform/cts/+/1676220

Change-Id: I7f37e1a9047b332467d960b8a7c2c18639101cb3