Merge "use aidl: local_include_dirs" am: 4b650ae198

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

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