Merge "Add basic test coverage for sysystemfeatures-gen args" into main am:...

Merge "Add basic test coverage for sysystemfeatures-gen args" into main am: 12d4c491 am: 3266b395

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



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