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

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

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