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