[automerger skipped] [DO NOT MERGE] Fix extra constant value AGAIN am: c494783082 am: b5d8818776 -s ours

am skip reason: subject contains skip directive

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

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