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 am: c8578e21

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



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