Merge "Don't construct the RP context for KM <= 4.1" am: 1c0be97c79

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

Change-Id: I628a964ac173508fd56ec3e6528ac58ab7ba32c9