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