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