Merge "Remove the GenerateRkpKey service" am: 067a2fde55 am: f1cfe0ee11 am: 3ede8dd0be

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

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