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