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