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: 4a6bdb2f

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



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