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