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

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

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



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