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