Merge "Address edge cases for signing certificate lineages in sharedUids" into rvc-dev am: 2046776127

Change-Id: I500c6b25f855c6772bf7775f3995647cbecaa0f9