Merge "[sf] Properly update clones of clones" into udc-dev am: 351604dd

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



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