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