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