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: I0419184c81ae9f70c24a0c9fc4d789d5a68b7a82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>