Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c0 am: 6fb097c0

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



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