[automerger skipped] Add "unlocked device required" keystore API am: 9371e95bb0
am: 34251077a0  -s ours

Change-Id: Ib7d1d9c4c67d6d69e0a052e1fdaf7d6246ed5392