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