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