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