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