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