Merge "Move the same-name-different-product configs from res folder to...

Merge "Move the same-name-different-product configs from res folder to res-product folder" into udc-dev am: ae2c14a0 am: 782287ad

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



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