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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ac765a6e3789e6bf8bd523172a61bcfc0aa2d5d