Merge "Merge "Keystore2 Metrics: System server rerouting" into sc-dev am:...

Merge "Merge "Keystore2 Metrics: System server rerouting" into sc-dev am: 06327bba am: dc55661f" into sc-v2-dev-plus-aosp am: ccf811f1

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

Change-Id: Iac106cd10106b688ec806d29270da9ebb3a49517