[automerger skipped] Merge "Fixing notifyKeyGenerated for hybrid RKP systems." am: 10ba178301 am: a8dfc071d0 -s ours

am skip reason: Merged-In Icaad413bb2e077c99cf3eed83d8bbbfe290149d6 with SHA-1 8008e24f78 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/RemoteProvisioner/+/1732036

Change-Id: I0b1b1eca40dd0a7df1c0ac1a272628762e72e11b