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