Merge "Allow SYSTEM_UID to embed activities in trusted mode"