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