am 91886677: am 8955c54e: Merge "Data quick settings - Usage shown should take...
am 91886677: am 8955c54e: Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev
* commit '91886677':
Data quick settings - Usage shown should take into account merged IDs.