Merge "Make getKeyStoreForUid convert uid to namespace." am: fd1b9aa4cd am: 23db5bf15b am: 89f6fa14e2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I227302bf5a7d809b8ed68987bd7830220cb862e7