Merge "Sort list of flags, change comment about REVIEW_REQUIRED" into tm-dev...

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

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



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