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