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