Merge "assign labels to merged_txt modules with defs" into main am: 61bf3646a4 am: 4b20a9f47e am: 0fafd7d0ee am: 9474dcedc8

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

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