[automerger skipped] Merge "DO NOT MERGE Handle usageevents for work profile apps" into pi-dev am: 718c344daf
am: db581cb3d4  -s ours

Change-Id: I016f444e1edc45973698901f02450327218e5303