Merge "Add support testMode=false since KM RPC version 3" am: 7283acfd9b am: 8e9eaa9665

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

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