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