Merge "Rethrow SecurityExceptions in UsageStatsManager" into pi-dev am: c1eddaed6e
am: 92e2dadc0d

Change-Id: I61d7a43cc80a41ef2681f4c51ceedef538933a4b