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