Merge "Correct the naming of the variable" am: 1d896eee am: 05a19146 am:...

Merge "Correct the naming of the variable" am: 1d896eee am: 05a19146 am: 5d39c9c3 am: 147439c6 am: bb12a79c

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



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