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