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