Merge "SF: Fix duplicate callbacks from mirrored layers" into sc-v2-dev am: f2cf7639a8

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

Change-Id: I56de42f07911445ad5672ecd4a10776cdc24dbcd