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