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

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

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