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