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