Merge "Fix data limit notification issue" am: 478bbc1f3f am: 6ae10abbad

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c114c0f70e48d5a14b38a680f604aa49f89dd74