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