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