Merge "Rename split classes/variables for consistency" into tm-qpr-dev am:...

Merge "Rename split classes/variables for consistency" into tm-qpr-dev am: 422f1d8b am: 21dceecc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18639323



Change-Id: Ieb75e7cd64d9742bca9500968b5657884a377bc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>