Merge "Support new generated CustomFeatureFlags" into main am: 0886f9289c am: 4910280e44

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

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