Merge "Revert "[sf] Properly update clones of clones"" into udc-dev am: 58df7b9c am: 775e90d0

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



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