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