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