Merge "Add merged txt filegroups that depend on the exportable non-updatable...

Merge "Add merged txt filegroups that depend on the exportable non-updatable txt files" into main am: 9e12339d

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



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