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