Fix a no-op uninstall being treated as a failure
am: bb6b42638b  -s ours

Change-Id: I85d32337b66e4690de3d8a931d2f03bafbd6f136