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 am: c990a2f0

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



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