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