Merge "Fix the case where blocked reasons for dataSaver are not considered." am: 24b9401c61

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1648787

Change-Id: I4aa1faf4ecdbddc1a40eb8e841f821cfa91083a6