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