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