[automerger skipped] Merge "Renames customization content provider (2/7)."...

[automerger skipped] Merge "Renames customization content provider (2/7)." into tm-qpr-dev am: 53b342a8 am: 3802fbf7 -s ours

am skip reason: Merged-In Idc0765a8c3fe50c82689d2ca7f9d19b41a62baf2 with SHA-1 6f775624 is already in history

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



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