Merge "Restrict access to instant app data in usage stats" into oc-dev am: f38a1d3d2a
am: fd1dd05815

Change-Id: I9e06dfc17f934210bcfddb44fc7be7056c9b054c