Merge "Keystore 2.0: Fix correct handling of Uid/Namespace" am: 75025c5b62 am: ace6cea9b0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I230b8b1cf1c14cc07c0617ba51e713a403ba3566