Merge "Merge "Relax enforcement of GET_USAGE_STATS permission." into oc-dev am: f5d5e5e4bf" into oc-dev-plus-aosp
am: 224b710a4f

Change-Id: Icdfe9487b2aa1d7d9245aaa87ccde048845b899d