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