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