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