Merge "Add pending messages to dumpsys" am: 803e3cd3af am: e137040028
am: b743377c8c

Change-Id: I69ed18f4b3257b0ed23e2a07d41393fe753debaa