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