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