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