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