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

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

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