Clean up USER_OWNER references in am/pm commands.

Bug: 19913735
Change-Id: I9cd27dc037048f4e5e312c769fc59669a4abf3e3
2 files changed