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