[automerger skipped] Merge "Don't construct the RP context for KM <= 4.1" am: 1c0be97c79 am: e8ef9b676d -s ours

am skip reason: Merged-In I0a64daf3d0aa122445612f29286e3be010315a16 with SHA-1 a59d9ca8a3 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1740596

Change-Id: If8b2f805637c2c134591fb68349919cedaf1675b