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

Merge "Final adjustments to privacy metrics:" into rvc-dev am: 27759900 am: 10193f95 am: 20f7c2f3 am: e50a2811

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

Change-Id: I935e7a64d5f1d5136f919fc97d5f3f2be93753f8