Merge "Add bugs in the flag declaration" am: caa50e9f44

Original change: https://android-review.googlesource.com/c/platform/development/+/2643058

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