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