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