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