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