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

Change-Id: I3a5dc53c426d48b64bab2020dc981ace538c8de9