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