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