Merge "Include all flags in our flag list." into tm-qpr-dev am: 8fd3032f

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



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