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

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

Change-Id: Ie0cbfe7638b5cbc0b738888084ed2f413de93826