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