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