Merge "assign labels to merged_txt modules with defs" into main am: 61bf3646...

Merge "assign labels to merged_txt modules with defs" into main am: 61bf3646 am: 4b20a9f4 am: 0fafd7d0 am: 9474dced am: f7408200

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



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