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