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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8e1dd5224970f6ac4379cfa86584ca2afaf0b6c3