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