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