Merge "Added export_include_dirs in libfakeservicemanager" am: 3a44d98d am:...

Merge "Added export_include_dirs in libfakeservicemanager" am: 3a44d98d am: 6eff4401 am: 99d32a97

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



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