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

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

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



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