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