[automerger skipped] Correct the naming of the variable am: f86a2b80 -s ours...

[automerger skipped] Correct the naming of the variable am: f86a2b80 -s ours am: 329d8f7a -s ours am: 039f8fb5 -s ours am: f105b904 -s ours

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

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



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