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