Merge "Fix the shadow problem caused by layer parent switching" am: 8ab01b202f am: 6d3c8a29d4 am: 8fce12b797 am: 1041b72bd8

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

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