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