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