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