Merge "Use find-copy-subdir-files macro to eliminate foreach calls" am: c0de8cfcfa am: 94327cd047

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520140

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib739cc77e53e805476b73e0f086366c9ef280cca