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