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