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