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