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

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

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