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