Merge "Add PACKAGE_USAGE_STATS permission to shell." into oc-mr1-dev am: 471656b6d8
am: 1605878d62

Change-Id: Icaad605d492ae86a29596f202f4ddaac416bcb89