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

Merge "Hide data limit notfication if data not active nor default" am: b6fbb978 am: 38b31cdf am: 233ee2a7

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



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