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