Merge "light AIDL: use module_current" am: 1f613db028 am: caafc5e669

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

Change-Id: Ieb1ec15fedc7a4dfdd4efca47446d168c4b3af8d