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: eb2e8cec am: d8f78587 am: 89bafca0

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



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