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