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