Merge "Make generateKey() return a status" am: d6dbf31c am: 34eb1810 am:...

Merge "Make generateKey() return a status" am: d6dbf31c am: 34eb1810 am: c6030f07 am: 6615ac8b

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



Change-Id: I32e901567b709e26bad616d2e54ac29d05aa63ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>