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