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