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