Merge "Terminal: support AIDL" am: 197465aac0

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

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