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

Change-Id: I45d6a707d56965a7c087a6435d3cd266ae86d90c