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