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