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