Merge "DO NOT MERGE Handle usageevents for work profile apps" into pi-dev
am: 718c344daf

Change-Id: Ib539d391b3517e9281337a5ba3972bd8ca21caf1