Merge "Fix dumpsys display apptoken ordering." into lmp-mr1-dev