Merge "[sf] Properly update clones of clones" into udc-dev am: 12cda385

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



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