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

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

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