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