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