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