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