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