Merge "Sort list of flags, change comment about REVIEW_REQUIRED" into tm-dev am: 13deb7ff am: b301dd5f

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



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