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