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