Merge "Add @JvmField annotation to flags" into tm-qpr-dev am: eaf2dc07

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



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