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

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



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