Merge "Correct naming to make it clear" into udc-dev am: 64b68f5d

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



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