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: 48b872f1 am: e8f0bafd am: 7c98a36f

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



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