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