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