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