Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351 Change-Id: I7a3133f83570a82bb5e87dd1096d5d47f85f3390 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>