Merge "Merge "Fixing how SIDs are added to keys during generation time" into...
Merge "Merge "Fixing how SIDs are added to keys during generation time" into rvc-dev am: 1149789b am: f7693a5c" into rvc-d1-dev-plus-aosp am: 42341eaf am: cc2fee76
Change-Id: I7ce562ba7b35d954331c21128fdc42e344ed6dce