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