Merge "Add an implementation defined limit on number of keys in CSR" am: 2ac5066335 am: 2d5941a525 am: 75090d3593

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2275693

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