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