Merge "Rename a couple things to reduce confusion" into main am: 755f3741

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



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