Merge "Merge "[aapt2] Implement FeatureFlagsFilter" into main am: 3fc4d396...

Merge "Merge "[aapt2] Implement FeatureFlagsFilter" into main am: 3fc4d396 am: 14e2faed" into udc-qpr-dev-plus-aosp am: f4eaf090

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



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