[automerger skipped] Merge "Fix META-INF for settings library to match...

[automerger skipped] Merge "Fix META-INF for settings library to match robolectric" into main am: cd34a5f6 am: cc1d59b3 am: eb446ca1 am: acbb1b55 am: 46737830 -s ours

am skip reason: Merged-In I2711538ff9c2a18f3cad80e384d0281b119cb94a with SHA-1 88a9d3fa is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2731384



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