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