Merge "Refine systemfeature codegen behavior" into main am: e6ba96dd2e am: b1d0238c3d

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

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