Merge "Added export_include_dirs in libfakeservicemanager" am: 3a44d98d8e am: 6eff440147

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

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