Merge "Fix the shadow problem caused by layer parent switching" am: 8ab01b202f

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

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