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