Merge "Hide data limit notfication if data not active nor default" am: b6fbb978

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



Change-Id: I03ecbf6e882c4499f5549f2a48fdb01b0b8ba862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>