Merge "Make getKeyStoreForUid convert uid to namespace." am: fd1b9aa4cd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a4b33a1b734a63fe206f41425fd31fcb234d476