am 2abc8aa0: am 105e8f3e: Merge "Fix dumpsys display apptoken ordering." into lmp-mr1-dev

* commit '2abc8aa032c5e4d7caaac196c1ecb5bb57d459bd':
  Fix dumpsys display apptoken ordering.