Merge "DO NOT MERGE: SF tests - completely remove ChildLayerTest" am: 866e547174 am: 1ab1837b4b

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

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