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