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