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: I8c62657c6d8d09e81dd5b6cc09c99ead2a8cb238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>