Merge changes from topic "aidlCameraHalInterfaces" am: c1671c38c8

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

Change-Id: I18fdbca6ce27ce2e8532ac5e62aeaf0166fc5604