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

* commit '105e8f3e9ba29997f700194c9031fa56456b202b':
  Fix dumpsys display apptoken ordering.