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