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

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

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