Merge "Sort list of flags, change comment about REVIEW_REQUIRED" into tm-dev am: 13deb7ff04 am: b301dd5f0b am: 7512959078
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17805782 Change-Id: I13589bbf9d221134c4fb85f0a140341b0834b00e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: