Merge "Tweak some variable names" am: 87b4438d97 am: e1839ff965 am: 01bbc0e1da

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52dd71035f395cc848f4c18b81cc4d2542a4f797