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