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