[automerger skipped] Merge "Allow changing signing cert for system apps that use shared users" am: f98f8a4c6c am: cb39c1a9ef  -s ours
am: 934df382cc  -s ours

Change-Id: Ibbd9d039bb6067a156ca26787136e30d8bb1e4e4