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