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