Merge "Final adjustments to privacy metrics:" into rvc-dev am: 27759900 am: 10193f95 am: 04918d2a am: 1e34615d

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

Change-Id: I742ee4337df7957866ad2dda88e7ed839ac92fae