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