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