Change os="adminuser" and os="enduser" to audience=""

Closes-Bug: #1252810

author: diane fleming

Change-Id: I69cbcdac6018b4c48d344abc416fa102e2530688
backport: none
Merge "Change os="adminuser" and os="enduser" to audience="""