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

Change-Id: Iab5b7851597d841640a7c27927d915dce28d2fd8