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