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

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

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