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