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

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



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