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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2ce29c0bbd386105ca3ff2d4322d30e83250c6e