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