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