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