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