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