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: 71ddd501 am: fea00c5c

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



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