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