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