Merge "Move CF only tests to CF test mapping suite" into main am: 19224ed589 am: 1b51ffb4e4 am: 8534e84a3e am: 72993115f3

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2754947

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