Merge "Fixed data icon disappeared issue" into sc-v2-dev am: 06a8244c am: 4a121e85

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

Change-Id: I7c42c945e1876485649b5e4188bd5c4ce7a7d271