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