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