Merge "Update cache_sdk_system_features aconfig flag bug" into main am: 2cbf4055

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



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