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