Bug: 13277  Fix removing orphaned device entries.
Bug: 13278 Fix removing EAS device pairings via the RemoveUserData API.
BFN