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