Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev am: 4a4f13d5 am: 0c99e2b1 am: f4d84fae

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919140

Change-Id: I39d9df79aa6f8b237d701fabff606bad8418ed87