[automerger skipped] Merge "Fixed data icon disappeared issue" am: 3630793506 am: a209be5b90 am: 68a3cacf39 am: 98c8c05053 -s ours
am skip reason: Merged-In Icba446e879e4d892829b41fdea50ebc1a10bf832 with SHA-1 c50ef8d04f is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885313
Change-Id: Iba6310b96f956ae255fe858a06d394f10e3dd615
This commit is contained in: