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