Merge "Tests updated to handle RKP-ONLY property on GSI builds." into main