Merge "Add keystore API for metrics re-routing." into sc-dev am: ff8321a2ef

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/14937650

Change-Id: Ide4188b3398767b828a1052d9897099382cee379