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