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