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