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