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