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