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

Change-Id: I6075b3b4ab6d204cce51d55ed86ae9df97ddca9d