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: 62271a94 am: 08722c17

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



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