Merge "Deprecate FILE_NAME_TAG" am: 8520a96d35

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

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