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