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