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