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