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