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

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



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