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