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

Change-Id: I83404a077882a823e5ff63b70f47bba9435e9f57