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