Merge "Terminal: support AIDL" am: 197465aac0 am: cfa266e1b3

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

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