[automerger skipped] Merge "[DO NOT MERGE] Fix extra constant value AGAIN"...

[automerger skipped] Merge "[DO NOT MERGE] Fix extra constant value AGAIN" into tm-qpr-dev am: b0b297da am: a2770ecd -s ours

am skip reason: subject contains skip directive

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



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