Merge "Final adjustments to privacy metrics:" into rvc-dev am: 2775990021

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931081

Change-Id: Ic381b4364a5d34489f2e11cd4d3bf5724aaa2e42