[automerger skipped] Merge "Treat undefined flags as false in resource flag...

[automerger skipped] Merge "Treat undefined flags as false in resource flag processor" into main am: 95151f9d am: 2a3c0d7d -s ours

am skip reason: Merged-In I978c837f13605d3958b176dec95565fdab1080a5 with SHA-1 838d7255 is already in history

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



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