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