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