Merge "Reorder members of the class to keep flags at the top." into tm-qpr-dev am: cf12ebac

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



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