Merge "clean up UserHandle.USER_OWNER reference"