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