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