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