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