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