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