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

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



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