Merge "use aidl: local_include_dirs" am: 4b650ae198 am: 5aba2712c8

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

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