Merge "DO NOT MERGE Allow cross user usage event queries" into pi-dev
am: 452936192f

Change-Id: Ied4b55365157a03f9bcc15166b330ceb2e62530c