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