Merge "Fix uninstall with keep_data flag on multi-user" into rvc-dev am: 770ba1c98e am: ddb6ae971e am: 79dd912287

Change-Id: Id3ead0c8fa1bcf5e22911f16f0186ca0ee19633f