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