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

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

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