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