Merge "Only add files in GlobSymbolsDir." am: 1fdef9f560 am: 59f7c0f939 am: 1eaafebbf8

Original change: https://android-review.googlesource.com/c/platform/development/+/2294097

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