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