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