Merge "Added export_include_dirs in libfakeservicemanager" am: 3a44d98d8e am: 6eff440147 am: 99d32a97e3 am: a9dab72760 am: 641a24c3f6

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

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