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