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

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



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