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