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

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



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