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

Merge "Merge "Hide data limit notfication if data not active nor default" am: b6fbb978 am: 38b31cdf am: 233ee2a7 am: f05f404b" into udc-d1-dev-plus-aosp am: 671b43d3

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



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