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 am: 1041b72b am: cc479526

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



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