Merge "Don't include AIDL NDK output if not needed" into main am: 377dcaa9c5 am: fbec5883d5

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2795345

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