[automerger skipped] Merge "DO NOT MERGE Allow cross user usage event queries" into pi-dev am: 452936192f
am: 313c1f04cf -s ours
Change-Id: I2180c4e6df284718fcf41765735c54412d826d29
This commit is contained in: