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