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

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



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