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