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