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