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