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