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