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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5facec5a06f44bd48fa74efb85dd2a8e565e3426