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