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