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

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



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