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

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



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