[automerger skipped] Merge "DO NOT MERGE: SF tests - completely remove...

[automerger skipped] Merge "DO NOT MERGE: SF tests - completely remove ChildLayerTest" am: 866e5471 am: 1ab1837b am: bb28d109 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2254260



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