Merge "Tell KeyStore to ignore caller uid for PlatformKeyManager's keys." into qt-r1-dev
am: f7ed4da59c

Change-Id: I8dfb9dcd0952058e0da6518a8868bb2257e58749