[automerger skipped] Merge "Fixed data icon disappeared issue" am: 36307935 am: a209be5b am: 68a3cacf am: 98c8c050 -s ours

am skip reason: Merged-In Icba446e879e4d892829b41fdea50ebc1a10bf832 with SHA-1 c50ef8d0 is already in history

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

Change-Id: Iba6310b96f956ae255fe858a06d394f10e3dd615