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