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