Merge "[DO NOT MERGE] Fix extra constant value AGAIN" into tm-qpr-dev am: b0b297da79

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

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