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

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



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