[automerger skipped] Merge "Correct the naming of the variable" into udc-dev...

[automerger skipped] Merge "Correct the naming of the variable" into udc-dev am: 92b3d1a6 am: e307959a am: 7f748684 -s ours

am skip reason: Merged-In If65e0ce229983a0b84fe3ad63710e18f76c3be17 with SHA-1 f86a2b80 is already in history

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



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