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

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



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