Use UserOptionsManager instead of deprecated/removed User methods

Bug: T314416
Change-Id: Ib4863d9aecf8fb21674d95cd5bc0661a20fe7c12
2 files changed