[automerger skipped] Use both module name and stem name to filter updatable...

[automerger skipped] Use both module name and stem name to filter updatable boot jars am: aba52756 -s ours

am skip reason: Merged-In I6c459fc3597b1e4f062bc9a4e52843305b538c5f with SHA-1 56c93e89 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15215490

Change-Id: Idc391ab80aa31d5bebe599c549d5f0f3541e87ef