[automerger skipped] Merge "List baseline_filename on modules that are...

[automerger skipped] Merge "List baseline_filename on modules that are implititly using it" into main am: 1028a98d am: 815ed7c8 am: d8ba9c19 -s ours

am skip reason: Merged-In I4e74094eed3f5a0b7395bcb5e16cbee9f0f28b7e with SHA-1 749a6885 is already in history

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



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