Replaced removeUserOrSetEphemeral by removeUserWhenPossible

Bug: 199446770
Test: m (successful build)
Change-Id: I5d46b168979b954921d99183db2362a77d7fa09f
7 files changed