Renamed removeUserOrSetEphemeral completely

Remaining Task: add more CTS tests for removeUserWhenPossible

Bug: 199446770
Test: m
Change-Id: I709ad0eeba3d01f11000b2f5647f385b17fa9c63
2 files changed