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