[automerger skipped] Merge "Fix the case where blocked reasons for dataSaver...

[automerger skipped] Merge "Fix the case where blocked reasons for dataSaver are not considered." am: 24b9401c am: a1a58daa am: 0d2e89ae -s ours am: 05197b64 -s ours

am skip reason: skip tag Change-Id I3c90c3849261df4c289c398f22661f91f7cf4994 with SHA-1 49ffed57 is already in history

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

Change-Id: I073003c22cec487b29af1fe9f95e313f62d2be42