Merge "Clean up apks installed for a removed user" into lmp-dev