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