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

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

Change-Id: I98c04ae286b11c6b403aefb91cef7ab45efebd35