Merge "[aapt2] Add placeholder --feature-flags flag" into main am: 28226eec72 am: ea23cb3b98

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

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