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

Merge "Final adjustments to privacy metrics:" into rvc-dev am: 27759900 am: 608a7aa9 am: bbc14909 am: 8e2b47d9

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

Change-Id: I327bb618d0a0b11164f5afb5b178f685b3e12c69