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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2be2dae8b59c099acc340b5589cf15f0a79ddbb4