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