[automerger skipped] Merge "Remove unused empty filegroups from...

[automerger skipped] Merge "Remove unused empty filegroups from frameworks/base." am: 5ee9c551 am: 76e9b955 am: 735d0192 am: 36b1820a am: 84e7dfdc -s ours

am skip reason: Merged-In I2209df4b6f0b4daddc640fc4126ba89601df2c2b with SHA-1 4e7bf041 is already in history

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



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