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

Merge "[sf] Properly update clones of clones" into udc-dev am: 351604dd am: d278faab am: 8ef8445c am: 832d3a56

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



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