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