Merge "Fix the shadow problem caused by layer parent switching" am: 8ab01b20 am: 6d3c8a29

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



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