Merge "Refactor function to support slot size not must be two." into udc-dev...

Merge "Refactor function to support slot size not must be two." into udc-dev am: fbe85872 am: 581f3e82

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



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