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