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