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