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

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

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



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