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

* commit 'e9d65deb3d06ddc9c03a3a62e9faf37a8eaef509':
  Fix dumpsys display apptoken ordering.