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

Change-Id: Iacf518f35cf807811113d86911f40009e8506f94