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