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